Remove deprecated gtk_binding_entry functions
authorChristian Dywan <christian@twotoasts.de>
Wed, 7 Oct 2009 15:37:19 +0000 (17:37 +0200)
committerJavier Jardón <jjardon@gnome.org>
Sun, 2 May 2010 23:39:49 +0000 (01:39 +0200)
gtk/gtkbindings.c
gtk/gtkbindings.h

index db5d83a722de51140749e0c21f86744a5a6ed576..c75e22058718770b78959004b553011802c75cc6 100644 (file)
@@ -706,37 +706,6 @@ gtk_binding_entry_clear_internal (GtkBindingSet  *binding_set,
   entry = binding_entry_new (binding_set, keyval, modifiers);
 }
 
-/**
- * gtk_binding_entry_add:
- * @binding_set: #a GtkBindingSet to clear an entry of
- * @keyval:      key value of binding to clear
- * @modifiers:   key modifier of binding to clear
- *
- * Adds a binding entry.
- *
- * Deprecated: 2.12: Use gtk_binding_entry_add_signal() instead.
- */
-
-/**
- * gtk_binding_entry_clear:
- * @binding_set: binding set to clear an entry of
- * @keyval:      key value of binding to clear
- * @modifiers:   key modifier of binding to clear
- *
- * Clears a binding entry.
- *
- * Deprecated: 2.12: Use gtk_binding_entry_remove() instead.
- */
-void
-gtk_binding_entry_clear (GtkBindingSet *binding_set,
-                        guint           keyval,
-                        GdkModifierType modifiers)
-{
-  g_return_if_fail (binding_set != NULL);
-
-  gtk_binding_entry_clear_internal (binding_set, keyval, modifiers);
-}
-
 /**
  * gtk_binding_entry_skip:
  * @binding_set: a #GtkBindingSet to skip an entry of
@@ -1588,22 +1557,6 @@ gtk_binding_parse_bind (GScanner       *scanner,
   return G_TOKEN_NONE;
 }
 
-/**
- * gtk_binding_parse_binding:
- * @scanner: GtkRC scanner
- *
- * Parse a binding entry from a gtkrc file.
- *
- * Return value: expected token upon errors, %G_TOKEN_NONE on success.
- *
- * Deprecated: 2.12: There should be no need to call this function outside GTK+.
- */
-guint
-gtk_binding_parse_binding (GScanner *scanner)
-{
-  return _gtk_binding_parse_binding (scanner);
-}
-
 guint
 _gtk_binding_parse_binding (GScanner *scanner)
 {
index 0ff74230c4d5d583d2ac671921fb03357a56b4c5..2d1cca9a7c41faac2514543b16f91c26386b5496 100644 (file)
@@ -111,14 +111,6 @@ gboolean gtk_binding_set_activate  (GtkBindingSet  *binding_set,
                                         GdkModifierType modifiers,
                                         GtkObject      *object);
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define         gtk_binding_entry_add          gtk_binding_entry_clear
-void    gtk_binding_entry_clear        (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers);
-guint   gtk_binding_parse_binding      (GScanner       *scanner);
-#endif /* GTK_DISABLE_DEPRECATED */
-
 void    gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
                                          guint           keyval,
                                          GdkModifierType modifiers);